auto merge of #920 : CMGS/cargo/master, r=eerden
authorbors <bors@rust-lang.org>
Thu, 20 Nov 2014 16:29:25 +0000 (16:29 +0000)
committerbors <bors@rust-lang.org>
Thu, 20 Nov 2014 16:29:25 +0000 (16:29 +0000)
when I use this script in oh-my-zsh, it will raise an error, so I modified it..


Trivial merge